_STD -> _VSTD to avoid macro clash on windows git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@134190 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/stack b/include/stack index 2e00700..3d72f96 100644 --- a/include/stack +++ b/include/stack
@@ -125,7 +125,7 @@ _LIBCPP_INLINE_VISIBILITY stack(stack&& __q) _NOEXCEPT_(is_nothrow_move_constructible<container_type>::value) - : c(_STD::move(__q.c)) {} + : c(_VSTD::move(__q.c)) {} #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY @@ -135,14 +135,14 @@ _LIBCPP_INLINE_VISIBILITY stack& operator=(stack&& __q) _NOEXCEPT_(is_nothrow_move_assignable<container_type>::value) - {c = _STD::move(__q.c); return *this;} + {c = _VSTD::move(__q.c); return *this;} #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY explicit stack(const container_type& __c) : c(__c) {} #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY - explicit stack(container_type&& __c) : c(_STD::move(__c)) {} + explicit stack(container_type&& __c) : c(_VSTD::move(__c)) {} #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES template <class _Alloc> _LIBCPP_INLINE_VISIBILITY @@ -168,13 +168,13 @@ stack(container_type&& __c, const _Alloc& __a, typename enable_if<uses_allocator<container_type, _Alloc>::value>::type* = 0) - : c(_STD::move(__c), __a) {} + : c(_VSTD::move(__c), __a) {} template <class _Alloc> _LIBCPP_INLINE_VISIBILITY stack(stack&& __s, const _Alloc& __a, typename enable_if<uses_allocator<container_type, _Alloc>::value>::type* = 0) - : c(_STD::move(__s.c), __a) {} + : c(_VSTD::move(__s.c), __a) {} #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY @@ -190,12 +190,12 @@ void push(const value_type& __v) {c.push_back(__v);} #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY - void push(value_type&& __v) {c.push_back(_STD::move(__v));} + void push(value_type&& __v) {c.push_back(_VSTD::move(__v));} #ifndef _LIBCPP_HAS_NO_VARIADICS template <class... _Args> _LIBCPP_INLINE_VISIBILITY void emplace(_Args&&... __args) - {c.emplace_back(_STD::forward<_Args>(__args)...);} + {c.emplace_back(_VSTD::forward<_Args>(__args)...);} #endif // _LIBCPP_HAS_NO_VARIADICS #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY @@ -205,7 +205,7 @@ void swap(stack& __s) _NOEXCEPT_(__is_nothrow_swappable<container_type>::value) { - using _STD::swap; + using _VSTD::swap; swap(c, __s.c); } 